Follow-up to r37968: forgot to commit the change setRobotpolicy -> setRobotPolicy...

diff --git a/includes/MagicWord.php b/includes/MagicWord.php
index 5284e62..ca2a113 100644 (file)
--- a/includes/MagicWord.php
+++ b/includes/MagicWord.php
@@ -105,6 +105,8 @@ class MagicWord {
                'numberofadmins',
                'defaultsort',
                'pagesincategory',
+               'index',
+               'noindex',
        );
 
        /* Array of caching hints for ParserCache */
@@ -153,6 +155,8 @@ class MagicWord {
                'noeditsection',
                'newsectionlink',
                'hiddencat',
+               'index',
+               'noindex',
        );
 
 

diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index b9e0cee..404f94a 100644 (file)
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -3380,6 +3380,15 @@ class Parser
                                wfDebug( __METHOD__.": [[MediaWiki:hidden-category-category]] is not a valid title!\n" );
                        }
                }
+               # (bug 8068) Allow control over whether robots index a page.  FIXME:
+               # __INDEX__ always overrides __NOINDEX__ here!  This is not desirable,
+               # the last one on the page should win.
+               if( isset( $this->mDoubleUnderscores['noindex'] ) ) {
+                       $this->mOutput->setIndexPolicy( 'noindex' );
+               } elseif( isset( $this->mDoubleUnderscores['index'] ) ) {
+                       $this->mOutput->setIndexPolicy( 'index' );
+               }
+
                return $text;
        }
 

diff --git a/includes/parser/ParserOutput.php b/includes/parser/ParserOutput.php
index f98d564..5f69af7 100644 (file)
--- a/includes/parser/ParserOutput.php
+++ b/includes/parser/ParserOutput.php
@@ -23,7 +23,8 @@ class ParserOutput
                $mOutputHooks,      # Hook tags as per $wgParserOutputHooks
                $mWarnings,         # Warning text to be returned to the user. Wikitext formatted, in the key only
                $mSections,         # Table of contents
-               $mProperties;       # Name/value pairs to be cached in the DB
+               $mProperties,       # Name/value pairs to be cached in the DB
+               $mIndexPolicy;          # 'index' or 'noindex'?  Default is null
 
        /**
         * Overridden title for display
@@ -52,6 +53,7 @@ class ParserOutput
                $this->mOutputHooks = array();
                $this->mWarnings = array();
                $this->mProperties = array();
+               $this->mIndexPolicy = null;
        }
 
        function getText()                   { return $this->mText; }

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 2361b84..1ec6886 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -340,6 +340,8 @@ $magicWords = array(
        'hiddencat'              => array( 1,    '__HIDDENCAT__'          ),
        'pagesincategory'        => array( 1,    'PAGESINCATEGORY', 'PAGESINCAT' ),
        'pagesize'               => array( 1,    'PAGESIZE'               ),
+       'index'                  => array( 1,    '__INDEX__'              ),
+       'noindex'                => array( 1,    '__NOINDEX__'            ),
 );
 
 /**